From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 16 Jan 2010 11:59:23 +0000 (-0500)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~844^2~5232^2~29
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=2db38a6f98c2abb42b746064ce97417cccc27e68;p=emacs.git

Merge from mainline.
---

2db38a6f98c2abb42b746064ce97417cccc27e68